Cleaned up results and home templates