Added layout features and styling