Fixed update bug
Improved UI