Add checkboxes, fix bug with mouse checking