Initial DB Script and few UI changes