Merging dev with dev-image

dev-image needs an update because of the new GUI in dev branch.