Cleaning comments and fixing "problems" according to lint.
Bug fixing after testing on a smaller screen.
Cleaning the information messages.