Minor
Merge
Form fixes
Fixed buttons
Leave button fix
xMerge branch 'Web_Interface' into development