Fixing a typo which may cause the mode widgets to not update.
Fixing stpresence
Merge pull request #18 from bmmiller/st-presence-fix

Fixing stpresence
Initial submission of a new, more consistent design.
Merge branch 'master' into new-style
Removing redundant changes from master merge.
Merge branch 'master' into florianz
Merge branch 'new-style' into florianz