Updated Screen Design