Add some small touches to resolve loading feature