Migrating to Bootstrap layout