bug 536 done and small css fixes
Merge branch 'bug536' into staging