Footer and some improvements added