First page of discussion + small changes overall

Status: draft