Make navbar icon active as appropriate

Closes #21