Fixed a TODO by moving code, Select All, visual changes and context menu event
Context menu correctness