Adding Quick Access View and more tweaks