Moving back to .net 4.0
Fixing the annoying issue with bad borders