updated building blocks
organization of screens