Comment_menu clean-up (#6, #90) - LAN and GUI