Add / delete tags, some styling and fixing