Fixed authorization and history view