Trying to fix border block(work in progress)