fix top bar shiz, utility classes, sidebar active state styles
merge conflicts
merge conflict