Minor refactoring and add new screenshots