Added Dvorak layout, general code standardization