Added UI & controller