add sidebar
Merge branch 'dev-nas' into dev-ui
add upload button
Merge branch 'dev-ui'