Resharper Tidying.
Update to C# new.
Remvoed old validation code as it isn't supported in Universal Aps...
Moved EditLayout to a single object.