header alignment cleanup v2