Fixed all other buttons