re-arrange html

 clearer structure