More GUI Work

WOOT