More tweaks, removing spark button