Fixing some bugs with the boostrap layout