adding setup and restructuring layout