Deleting trailing white-space
Fixing highlighting of items in the top menu