Feature/workflow menu and tweaks

few P2s resolved... titles, counters, buttons