chaning naming convention for views + help improvements