cleanup
disable highlighed for arrows added
uncomment first screen block