Finish block optimization - TODO fix all rendering