okapi r798
layout fix for usertops
Merge branch 'stable'