Improved homepage template