Cleaning up billing panel a little.  Fixing issue where validation would run when not required.