added sidebar and navbar