Improvements to layout/ design, but features are broken....