I think having a checkbox that toggles between your suggestion and how it currently is would be optimal, but that's just because I prefer to focus on the smaller box.

I like the UI you suggest as an option. Good stuff. edit:option toggle.