Refactoring a looot!
Grid is now also col-based
Continued improving layout