Update bootstrap and clean up layout