Add bootstrap and improved formatting