Fix alignment issues with project-layout