category, messages and navigation fixes