Improved layout removing categories and large font