Finished basic layout + naming