Update bootstrap to the latest version, and improve the layout