Cleaned up the UI a lot. Prepared for other platforms