sticking with fluid
header cleanup