Changed the screens to bootstrap standard