Yes, that sounds about right. Unfortunately I would like to avoid that, as it would require a lot of styling and script changes and potential issues with API. I have attached another possible version, please let me know if this one is okay for the validator.
