Moved page elements into html table