Moved to EJS files and added call to user service