Some tidying up and reformatting
Added CreateSignal and CreatePoint to popup menus
More reformatting