Programs: Improve program layout