general cleanup and added capslock remove in us layout