Make sizes correct and put checkboxes in the right place