Back to green

with a few visual updates