Adding user service and reorganizing some views