Fixes for css and more Structure data adjustments