[DEV] better context menu display and some small corection