Updated semantic Framework + minor layout updates