GUI Overhaul/Cleanup. Closes #700