Migrated base controls to a separate layout file