Rearranged li hierarchy in HTML for cleaner updates