improved layout and styling