new checkboxes and cleaned code on mainpage