Fixing layout alingments