Re-ordered the plugin for easier adding of elements in the future and better usability