Moving around layouts to be named more sanely
Adding in some basic titles