Fixed Submit and live issues