Fixed UI To Work With New Database