Fixes disconnect issues
Moves sign out button to drawer
Merge