Updating  to make the context menu embeddable and moving all mixin updates to the end