Switched to individual checkbox fields.Fixes #9. Also refactored border generation.