Minor layout tweak and initial addition of tracking attrs