AG|ST: more design tweaks from bruno