Layout improved, but needs rework to not use scroll.