Refactor the subscription pageto be much nicer