Revert "Making minor changes"

This reverts commit d6f94e3090f272620fc46dd5da96a018b3a594d9.
fixed custom layout with Jo
Merge branch 'master' into feature/exception

* master:
  fixed custom layout with Jo
  Revert "Making minor changes"