Better defaults for application name, actually include the application layout