Tidied up index and user templates