Added missing files, Fixed logout crashing the application