fixed reopen + display components
fixed assert
Merge remote-tracking branch 'origin/master'