Some bugs fixed
Merge branch 'master' of github.com:crcd/Experimental-User-Interfaces