improved layout and design