Fixed layout issues on large and normal
Merge branch 'henry-branch' of https://github.com/Corsus/E381_Group_11 into henry-branch