Added more ui yeay (Try running it to check it out yeaaaay)
fix merge conflicts