Minor CakeView reorganization