Made some small changes, e.g. resolve navbar issues