Improve controls module