Added UI. Fixed some Bugs