Merge from Sjors and added the bottombar

Review @tmsburgt