GUI Work

Made the switch work, and made some rendering changes from the last
commit.