fixes + data main page wip