Design tweaks

Thoughts?