Refactored layout and added layout mockup page