Added bootstrap and layout work