minor ui refactor, start of source image stuff