why u no clear screen :(
Fix inconsistencies with saving last selected base
Refactoring
Merge remote-tracking branch 'upstream/master' into testing