Improve context menu display
Release 0.4.12