Changes after Database_table bug resolved and some other UI changes