Billing and panel selection
Added some more features