fixed DB issue and the UI stuff..