fix homepage field
reorder code