Added other screens and connected buttons - YANO