fixed some of the bugs and UI