Add some fixes to Role and User tables
Change file name for Role table