Changed layouts to use consistent naming scheme. Fixed #6