Added screens code
Added states