Added bootstrap, new layout