Separated some parts of app to make code cleaner.
+ Other small changes.