Another attempt... with some layout improvements.