Corrected some screen idantities according to the new google design