Updated and refactored layout
Updated and refactored