Add mixin for bordered boxes
Improve fixed navbar styles
More refactoring
Merge branch 'feature/refactor' into develop