7 Commits (styling-fixes)