Unify template directory
Fix user views