Separated template for alerts; Added interface for constants in velocity context; Added popover for bookmarks editing; Fixed comments from last commits