Added some better loading ux