Navigation drawer update and small fixes