Cleaned up UI a bit, and simplified the options.