Several little bug fixes, mainly involving UX