- Fixs & merge
- Angular loading bar added