More gui work added.