Adding tags
Added TabBar plugin
Reorganized