Added bootstrap and tidied up layout