Master layout fix
Merge branch 'Development' of https://github.com/oSoc14/code9000 into Development