Few more tweaks to fix the secondary view