Various changes, updated keyboard layout