Adds margin, renames ui style, and adds no-border option