Added test client
Updated form to be slightly nicer