Add some margins
Fix for new style paths

(got lost somewhere)