Refactored GUI Code

Removed unneccessary code, now going to try and figure out look&feel
issue