Updated UI Branch
Resolve index.html