Fixing issues website