Added the loader and fix the main page