Fix app crash on screen rotation
Change some string values
Refacor code