code and ui update