Re-design main page in-progres