Make component more keyboard friendly