Improved layout of AddEditStory tagging
Merge branch 'StoryTagging' into development