Restored some of the logic on the narrow/wide note lists.
It is still broken, but not as bad.