Changed name and updated tests
Cleaned code
finished layout and routes