views for index and employee
fixed conflicts