Add toolbar buttons and some server-side changes