Joining-Fixes

Fixed the joining features, and also re-arranged the UI to make more
sense.