Final version of prototype
add user navigation
Replace link tempate
fix
Bug fixes.