LUN-1507 : Fix checkboxes and scroller