ui (implementation) improvements