Update files
Finesh layout and routes