Cleanup

Rewrote a bunch of the designer files.