Layout fix and sidebar highlighting fix