lots of styling and misc fixes
added second step to rickshaw to merge old with new data