fixed issue with displaying wrong number of buttons for partners
scrolling fixes in service reporting
Merge remote-tracking branch 'upstream/master'