Added Event Sub for UI

Cleaned up a few other things. Code may be approaching readable.