Starting work on Clicked Vertex Menu, minor refactoring