Update and changes due to switching to US layout