Additions and Bug Fixes

Added more options.
Fixed some bugs on 'tags' view