Fixed some issues with rule targets and the new design.