Styling tweaks and marker work