Fix master buttons and display button issue