[minor] [fixes] ui and related