Improved layout and responsive