Style update, fixed key layout problems