Improved layout and views