Tweek layout positions, font, colors. Update tests to pass.