changed view and added user stuff