#52 small layout changes
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev