Added Loader function and made some changes to bootstrap