Fixes for better http usage
Fixing modal file name and stuff lost through merge