New screens added, some refactor done, improved handling with database.