More gui. removed big block of old code.