Added bootstrap and layout updates