Major ui changes to the index