Added base for tag editing ; and bunch of view updates