added the different layout files and modified the other accordingly.

Probably last commit before restarting the project