Fix controls in singular views. Cleanups.