Cleaned up index pages and UI