Switch to Commander

I think it looks a lot cleaner.