added alot of ui changes