Start work on contextMenu & other small changes