Fixed block addition

And added selected block highlight