Minor UI changes and db setting