Merged web files in properly this time