Improved layout and header