Removed example stuff and added layout