Merge branch 'master' into ui
fixed navbar rigidness
share btn added
mege stuff
Merge branch 'master' into ui
fixed issue with top/bottom captions