Improved and extended embedding for Elgg