UI Changes and Cleaner Code

Closer to a working BETA.