fixed single page bug + follows new html layout

also updated to follow the suggested html layout (still needs comments
and their separation).