refacterd layout blocks