FIX: borders are finally gone