Fixing some bugs and UI improved