new look and feel
fixed header conflict