Changes to use use bootstrap