Clean up and enhanced logging and screen management