Switching to connect 3.0 and moving logout button