First commit
Corrected the layouts