Add dashed border back and extra padding