Layout changes
Merge branch 'Development' of https://github.com/alexfakhri/University-Kickstarter into Development
Merge Issues
Merge conflict fixed