[i] improved #11 for non-tabbed view