Adding some UI features (check database)