Updated with border-radius mixin