Some Fixes to css js problems.
Merge remote-tracking branch 'upstream/development' into development