Added wide content case and fixed arrow icon for context-switcher