minor
css revised
Merge branch 'ui' into development
layout changed
Merge branch 'ui' into development