Tag & Untag done
Added some icons