More interface updates and logic to restrict guide visibility