Adds UI for setup; tweaks minor things