small improvement in ui and utils