did some refactoring and added info screen