Complete overhaul and fixing of the application