fixed layouts
Merge branch 'master' of https://github.com/eternalearth888/csci446_team