Fixed some variable names and indentation in ListHistoryAdapter, MainActivity and some fragments
Fixing git conflicts