Some code shifting
More string editing to made app more understandable