Fix style errors
Merge branch 'develop' of github.com:matrufsc2/frontend into feature/matrufsc2