Minor gui and funcaionlity change