Added dhisAPI-functionality + small navigation fix