Add bootstrap and layout changes