fixed a few positioning issues
Merge branch 'bootstrap' of https://github.com/TEAMMATES/repo into Issue2050
Merge branch 'bootstrap' of https://github.com/TEAMMATES/repo into bootstrap