Refoactored Screen controller