Fixed billing UI issues