Fixed Various bugs across the application