Admin uat feedback

Incorporates most UAT feedback on the billing admin UI (except for making the country field a dropdown).

Also fixes a bug where the "Add Software Plan" button was removed.