Included citing in UserInterface & removed some unecessary code