Fix some site issues. Make it our own