Landing page check boxes and result page done.
Fix merge conflict