Fixed layout and added checkboxes