UI fixing
Merge branch 'master' of github.com:EAAL/SE
fixing some ui bugs and add necessary features