Changed button color indications, fixed line toggle issues