Added UI Controller + other changes