added more UIstuff and fixed bugs