Updated TODO; changed style of headers on axis