Cleanup and added live links
Removed module from settings