UI changes and adding username/pwd to DB