Fix (#199, #207) - Nav bar related issues