7 Commits (fix/layout)