Fixing UI issue with margin