* Fix #5314 * fix not beautiful code * fix broken design with mobile view * remove no longer needed code