Big update

Cleanup, made button working, restructuring.