Reorganized mixins, and added link to navbar logo