Refactored boostrap layout