added if clauses so page will remember users selections