Minor Fixes, Hide name fields and Show/Hide action in context menu