finish work on styling & better dsl, tests green