Checkout style improvements

Resolves #164
Resolves #209