added: class based views + small inline fix