Make layout changes and work with blocks