Adding global error handling and beefing up UI