Dismiss gesture and toolbar buttons adjusted