Made some changes to the core layout