Fixed chosen style
Fixed alert style
Merge branch 'develop' into feature/developerMode-and-repeat