Add major changes to load static files properly