CAL-552 fix header alignment  in all views