Update
Refactor compnents
Update
Loading bar
Fix unit time