add states for test, minimized cls for blocks and screens, add screens