Adding layouts and hcd stuff