Added bootstrap and made some functionality changes