change layout, refactor casing