Border Block Fix

Still need to fix shadowing