Fixed settings issues and added back in context menu