Whitespace trim
Convert Credit Card page to new design; #607