A bit more display stuff (WIP: need ruleset link)
WIP: starting to merge builds