UI changes to support database changes