Restructured to use bootstrap 3