Toggle fix. Buttons and stuff