[#5] Plot tweaks