UI tweaks, moved many connections into the UI