UI changes and DB conn changes