UI improvements

Fixed some bugs and improvements UI