fixed templates
finalize look and feel
added tags