Layout fixes
Use master branch of Bolt