Added bootstrap and layout changes