Toggle Buttons + various fixes