Cleaned up configuration and added better link template