Added a proper loader with messages