Add hyphen support
Simplify controls page