Fix pristine bug
WIP on chart layout