new style choices for index page also beginning switch to html
fixed a merge error