Added new layout and styling