Fixing US layout and working towards custom