Added layout and styling