Improve page layout and flow