clean up
fixed header display and some code cleanup