View modes + bug fixes.