Updated for the new layout. (Fix for #77)