gas calculation
changing toggle button, small layout fixes