Updating layouts

Now more functional.
Merge branch 'master' of https://github.com/chepwo/CIT360