Improve controls (close #6)