updated for new html layout