working controls
Merge pull request #6 from csu/icons

working controls