Improve responsive and layout