Fixed checkbox
layout modification
fixed conflicts