Minor UI adjustment
Fixing states of the checkbox
Adding more padding