Update Cluster page and Fix Main Page