Merge branch 'wip'
Merge branch 'wip'
Merge branch 'wip'
Unwanted commit
Revert ebcf64a..b92cd39

This rolls back to commit ebcf64a9cec2716a5b6d17bb294e4c85be5cee1a.
removed link bug, active class for vault menu