Improved docking margins & other visuals