Clean up GUI package and stub out some future widget types