more work on gui rewrite