Cleaned up index and show pages