merge fix, changed navbar on add-site/manage-gesture, added delete butto...

...ns to manage-gestures