Update: sidebar and navbar