Layout changes

Made some changes to the layout, will need some additional work
Merge branch 'master' of https://github.com/wisingd/Dajoroli