Re-commit , Form tweaks, hopefully the sln does not get changed this time