added loading modal and modified navigation