Layout fixes; Refactoring of the mapper classes