Made a nicer form