Fix Website issues