Merge branch 'newlayout' of https://github.com/sugarcubes/SugarCubes