General UI changes

Still need to apply changes to database manager