Change layout, simplify parameter and add place for some text