Add loading message and fix the initial page