Improved homepage support