Remove blinking and fix bug when disabling discipline and etc.
Merge branch 'feature/usability-fixes' of github.com:matrufsc2/frontend into feature/usability-fixes