alpha version
fixed small window mode
smallview hotfix
cleanup
cleanup
merged smallview hotfix from master