Update files
Refactor Bar
Add List