Minor UX improvements and more (incomplete) database functionality