Minor refactoring
Fixed checkbox positioning