fixes in ui