Added labels + better style