Fixed up sidebar and navbar