adding back logic to swich between screens