Additional Changes to annual discount front end

Additional changes as requested by Mark Oakes