Color fix + next buttons