[Update] Buttons as span's