another commit
Merge branch 'master' of http://github.com/arkokoley/sani

corrected a few design bugs