Fix bugs on design
Merge branch 'feature/fix_404_and_500' into develop

It closes #48