Added tagsinput and some minor changes