UI is now working the way it should.