home page animation crudely done
conflicts resolved