last changes
Merge branch 'master' of https://github.com/snSWIIue/ubicomp
layout errors fixed