Revert "Small layout fixes + move checkboxes outside notebook"

This reverts commit 75402ce57fc4fd99537fa0322f4a7aa3a17afe39.