Fix header alignment issue
Merge branch 'development'