Name page working
Merged with Mihai's files