Edits to the core layout and some assets