some fixes and ui update