Added URL cell
started refactoring