Improve desktop and mobile design layout