Fixed a bit cancel connect bug, and some layout things